Autogenerated HTML docs for v1.5.4-rc5
diff --git a/git-pull.txt b/git-pull.txt index 77fdaf1..4cc633a 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -25,6 +25,7 @@ ------- include::merge-options.txt[] +:git-pull: 1 include::fetch-options.txt[] include::pull-fetch-param.txt[] @@ -34,7 +35,11 @@ include::merge-strategies.txt[] \--rebase:: - Instead of a merge, perform a rebase after fetching. + Instead of a merge, perform a rebase after fetching. If + there is a remote ref for the upstream branch, and this branch + was rebased since last fetched, the rebase uses that information + to avoid rebasing non-local changes. + *NOTE:* This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option
